[master] 2055-Custom_Main_Window#383
Open
memurats wants to merge 13 commits into
Open
Conversation
memurats
added
custom
memurats
force-pushed
the
nmc/master/custom_main_window
branch
2 times, most recently
from
f41dc76 to
db2545d
Compare
memurats
force-pushed
the
nmc/master/custom_main_window
branch
from
c39a55a to
7ea6446
Compare
memurats
added
approved
build-ready
memurats
added
approved
build-ready
Collaborator
|
Very complex diff to be analyzed |
Collaborator
|
just pushed a merge commit that resolves the conflicts. The only change in the merge commit is the movement of the (invisible) % git diff --ignore-space-at-eol origin/nmc/master/custom_main_window...nmc/master/custom_main_window src/gui/tray/MainWindow.qml src/gui/tray/UserLine.qml src/gui/tray/TrayWindowHeader.qml
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index b3739356e..7cd5ed483 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -106,6 +106,23 @@ AbstractButton {
: userLine.parent.palette.text)
}
+ EnforcedPlainTextLabel {
+ id: accountServer
+ visible: false
+ Layout.fillWidth: true
+ Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+ verticalAlignment: Text.AlignTop
+ text: server
+ elide: Text.ElideRight
+ font.pixelSize: Style.subLinePixelSize
+
+ color: !userLine.parent.enabled
+ ? userLine.parent.palette.mid
+ : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
+ ? userLine.parent.palette.highlightedText
+ : userLine.parent.palette.text)
+ }
+
RowLayout {
id: statusLayout
Layout.fillWidth: true
@@ -141,23 +158,6 @@ AbstractButton {
: userLine.parent.palette.text)
}
}
-
- EnforcedPlainTextLabel {
- id: accountServer
- visible: false
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignLeft | Qt.AlignTop
- verticalAlignment: Text.AlignTop
- text: server
- elide: Text.ElideRight
- font.pixelSize: Style.subLinePixelSize
-
- color: !userLine.parent.enabled
- ? userLine.parent.palette.mid
- : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
- ? userLine.parent.palette.highlightedText
- : userLine.parent.palette.text)
- }
}
Item { // SpacerThe other customisations are unchanged from before apart from the line endings (which is why I ran |
|
memurats
force-pushed
the
nmc/master/custom_main_window
branch
from
2ce8f80 to
41088b3
Compare
memurats
force-pushed
the
nmc/master/custom_main_window
branch
from
41088b3 to
9af8827
Compare
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
main window changes